Replace the `platform :ruby18` hack with `install_if`

This is a new feature in Bundler 1.10.

Akinori MUSHA 9 年之前
父节点
当前提交
06827f99a0
共有 1 个文件被更改,包括 6 次插入14 次删除
  1. 6 14
      Gemfile

+ 6 - 14
Gemfile

@@ -131,22 +131,14 @@ gem 'tzinfo', '>= 1.2.0'	# required by rails; 1.2.0 has support for *BSD and Sol
131 131
 # Windows does not have zoneinfo files, so bundle the tzinfo-data gem.
132 132
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
133 133
 
134
-# Introduces a scope for Heroku specific gems.
135
-def on_heroku
136
-  if ENV['ON_HEROKU'] ||
137
-     ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
138
-     ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
139
-     File.read(File.join(File.dirname(__FILE__), 'Procfile')) =~ /intended for Heroku/
140
-    yield
141
-  else
142
-    # When not on Heroku, we still want our Gemfile.lock to include
143
-    # Heroku specific gems, so we scope them to an unsupported
144
-    # platform.
145
-    platform :ruby_18, &proc
146
-  end
134
+def heroku?
135
+  ENV['ON_HEROKU'] ||
136
+    ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
137
+    ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
138
+    File.read(File.join(File.dirname(__FILE__), 'Procfile')) =~ /intended for Heroku/
147 139
 end
148 140
 
149
-on_heroku do
141
+install_if -> { heroku? } do
150 142
   gem 'pg'
151 143
   gem 'unicorn'
152 144
   gem 'rails_12factor', group: :production